Fix e2e merge-command assertion broken by the ff-only step#44
Merged
Conversation
Since #40 the conflict comment's fast-forward step reads `git merge --ff-only origin/<branch>`, which assert_conflict_comment_merges picks up with its `^git merge` grep, so the extracted commands never match the expected conflict merges and the check fails on every conflict scenario. Skip the --ff-only line when extracting. This went unnoticed because tests.yml only runs on pull_request, so the breakage only surfaced on the first PR after #40 landed. 🤖 Generated with [Claude Code](https://claude.com/claude-code) https://claude.ai/code/session_01JHvKryT4QUpHYdNq9YEQxX
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Since #40 the conflict comment's fast-forward step reads
git merge --ff-only origin/<branch>, whichassert_conflict_comment_mergespicks up with its^git mergegrep, so the extracted commands never match the expected conflict merges and the check fails on every conflict scenario. #40's test tweak only handled the new# ...hash gloss, not the new merge line.This went unnoticed because
tests.ymlonly runs onpull_request, so the breakage only surfaced on the first PR after #40 landed (#42, run 27235483781).Fix: skip the
--ff-onlyline when extracting merge commands. Verified green as part of #42's run 27235912022 before being split out into this PR.🤖 Generated with Claude Code
https://claude.ai/code/session_01JHvKryT4QUpHYdNq9YEQxX
Generated by Claude Code